merge upstream

author jave <joakim@verona.se>

Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)

committer jave <joakim@verona.se>

Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)
author jave <joakim@verona.se>
Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)
committer jave <joakim@verona.se>
Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)
diff --cc lisp/desktop.el
Simple merge
diff --cc lisp/vc/vc-dir.el
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/dispextern.h
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	jave <joakim@verona.se>
	Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)
committer	jave <joakim@verona.se>
	Wed, 31 Dec 2014 11:24:10 +0000 (12:24 +0100)
		1	2
lisp/desktop.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-dir.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history